Merge "Fix sql.php --json behavior"